Fixing another nasty id bug