Fix for issue #3715