Fix for issue #2459