fixed reset issues