Use a more foolproof reset implementation, 0.2.1