Fix issue #721