Fix Ordering with isTarget, even less untargeting