Fix the #5 bug.