FIxed nullpointer