Changed check for OptionTree