Fix bug in command options order