- fixed npe