Refactoring hotfix