Bugfix commit