Fix for issue #4267