important fix
fix NPE