Optionable issue fixed