memory leak fixed
fix NPE