3.0.0 hotfix