Fix issue #735