Hotfix patch bug