Fair enough, but shouldn't sneak a bug fix in another commit