bug fixed nullpointerExeption