BugFix on Reset procedure