Fixing a bug, probably introducing more.