Fix critical issue with previous version