Resolution for crash bug