patch for 11/17