Fix for issue #733