Actually fix the bug