Here is a patch with a test.