This fixes aprox 35 fails in amo.dev