Thank you for reporting this, and with such a thorough reproduction guide! I've tracked down the issue, and I believe I've got a fix for it - It's pretty much what you suggested. The fix will likely be available as part of our next patch of the game.