Fix issue #691