Fix for issue #2061