Fix for an Issue #580