Possibly fix CommitHandler