Fixes #592

This changeset addresses the issue identified in #592.