missing patch for key handling