Patch for an Issue #636