I agree it is a bug fix. But since it is a bug fix that has nothing to do with what the commit message's rationale would explain, it needs to go into its own commit: http://git-scm.com/book/en/Git-Tools-Rewriting-History#Splitting-a-Commit