Fixed scope visibility errors on reset