Prince/Yogesh | | Stop lowercasing the option value