fix Issue #601

This resolves issue #601