Fixed bug with OptionalValue