Thank you, it's still our fault, we need to handle this automatically