Resolved crash bug