Fix 4/6 behavior