IIRC putting new units in the stack and then mark bugged units with the ok unit and drag them out should work as well.