Issue 2122

Pull request for issue #2122.

Should I write a test and/or is there anything else I should do to get this change merged?