#485-adding step for rollback handler