Fixed enum type order in option_structure.hpp