fixed a NotNull exception #89