Fix #25
Merge branch 'reset-after-changed'