fix order of commands