Fix command order