Fix 2.5 (again)