Fixed the parsing of the options