Bug fixed and improvement.