Refactor Hotfix