Pull request for issue #2459