Fix issue #731