Fix for issue #2090