Fix for issue #4024