Fix 'other' handling