possible fix for @NotNull in choices