Fixing a naughty bug