Fixed unfold at start method