Patch for an Issue #584