bug fix from git