Better onReset handling