fix #8
fix NPE