Fix 5.3 again