Fix a crash bug (2)