trying to fix critical bugs