Issue 2281

Pull request for issue #2281.