Fixing race leading to unbounded stats retention