*Actually* fixed server crash