Fix for issue3117