Please submit this change in a standalone pull request and include an integration unit test (see #272 for inspiration). I'd like to get this landed ASAP, as it looks like a bug fix.