fixed bug of last commit