Patch for an Issue #954