Logged In: YES 
user_id=6405

OK, I've really fixed this now, and there's a unit test and all. 
 
(I haven't committed the changes to the maint branch yet tho - would you 
like me to let you know when I do?)