Fix issue #733