Bug fix for choice index order when deleting an option.