Hotfix for Cloud. Last one I hope!