Hotfix for june