Fix order of steps. [#87]