fix crash bug via review