Refactoring, Bugfix