fixed command ordering