- fixed nullpointer