Fix issue #740