fixed bug with last commit