Fix crush bug