Actually fixed the bug