Option generaton fix