Fixing again parsing of options