better handling of the concurrent reset situation