Patch for better user experience