Fix yet another server crash