Fixed issue with form values not being stashed for custom steps.