adapt for the latest git version