Fixing a really nasty bug.