Bug fixed KBO & NPB