Bug fixed and quality of code