fixed NPE
fixed npe