fixed the botched crypto merge