quick fix enum and set options issue

it`s quick fix only, you should improve it better