Patch for an Issue #929