fixed rare npe