Fix code from previous commit so it's guaranteed to always properly reset