Handle case where current_step not in relevant_steps