Fix for an Issue #597