bugfix + an awesome commit message