Big old bug fix from git problems.