Bugfix and commit before refactoring
Bugfix and commit before refactoring - Oeps