Fix issue #732