fix NPE
fix NPE