Fix issue #772