Adding patch for v10.1