Another attempt to make git work