Fix only/except logic