Fixing a bug (2)