Fixing a bug...