Fix 9323857 (again)