#1: removed NotNull annotations