*Actually* fixed the bug this time...