refix the NPE