Fix a bug with unable to find choice field