Refactor Hotfix check into separate function