Fixed the awkward crash