Fix to issue #593.

Proposed fix to issue #593.