Another patch for errors