Since this looks like a bug fix, can you add a failing test case for the original code?