Fix 3+ variations