Hi Moose, thanks for finding this. I was already aware of the bug you observed when you made the 2nd edit, but not of the one you found when you made the 1st edit. But I'm pretty sure they're caused by the same problem.
I almost completed the fix this past weekend, it should be ready soon.