Temp fix for occasional 422