Better Reset handling