fix critical issue (step 2)