Fix issue #714