fix critical Bug