Fix for unexpected behavior described in issue #704