add commit and fixed bug