commit issue fixes