Patch for an Issue #921