Fixing a strange Git problem