Refactored hotfix