Now the selected element are correctly kept between steps