Fixed index issue on options field