nullpointer fixed