fix critical issue