Fix for issue #3347

Fix for issue #3347