Added patch for fieldfocus.