Adding fix for issue #733