fix the crash bug that last commit not fixed