Hotfix, clean env before restore