Fix command ordering