Fix issue #742