6 commit fix