fixed npe