FIxed compilation problem caused by @NotNull