fixed Npe