git-related bug fix