This looks like an unrelated bugfix. It should be submitted separately (and with a test to ensure it continue to work)