hotfix scope mix
tweaked reset