Fix issue #620