Hotfix 6/6/2024