Fix the #2 bug.