Removed @NotNull as its causing a crash during build