Patch for faster resolving