Hotfix for 2.0