Fix step-by-step mechanism

Return on the last step of the algorithm, when user create new object