Corrected behaviour on new options