Hotfix for 5.0