Fixing a problem while updating to HEAD