removed faulty option value handling