Fix 4b logic