fix: order of commands