Fix 3.4