fix to command order