Fix for issue #2086