*Actually* fixed CC crash