Fix order steps