Bug fix, and improvement.