This should handle reset correctly.
Small issue.