Fixed the option_single issue ...