Another try to fix git issues