Fixed possible bug with options