Improvement for remember step

OK, then please move it at least into some global variable / settings.