fix nullPointerException