fix commands order