Actually fixing the bug.