Fixing a strange bug...