Patch for an Issue #454