Bugfix on commit