Fix for an Issue #601