Fix to issue #593.