Cleaning commit for bugfix