this works for now
Finish Hotfix-1.6.0-alpha.8