Resolve crash