npe fix :(