Fix 3.2 functionality