Bugfix
Refactoring