npe fix
some revert prev commits