Fixed problem with command options