This was nasty, nasty bug :)