Fixing issue #704