fixed nullPointer