Fix mammoth again