Fix critical issue of previous version