Fixed a crash in the previous version