fixed resetting
Merge branch 'fix-resetting'