fix nullpointer