fixed nullpointerz