Properly reset on cancel