Yes, that makes sense - the only reason I put it there was because of the comment. The very thing FIXME wants to fix is the cause of this bug. I've moved both the comment and the assignment out of the block.