Deal with non-stage stages