Patch for an Issue #452