fix critical bugs found in MCX 0.9.7-2 or earlier releases