fix command order