bug form last commit fixed