Alright, I threw a bunch of stuff at the wall - it might be working now? Let me know if it still isn't - I couldn't get your specific bug to happen for me, but I think I know where-about it is happening
