Bug fixing for commiting