Change Details

@dumbbell reported the problem and provided a test case to demonstrate it. I would ask Peter to test it before committing.