Fix for issue #747
Fix for issue #747