Fix to work with latest version of git