possible npe fix