Fix the bug for real.