Still fixing the bug.