Fix issue #704