Fix for Issue #601

resolves issue #601