Changed internal representation of options value to int