Patch for an Issue #449