Bug fixed and improved