Fix for issue #3834