Really nice stable version, revert here. Statistics collection happens correctly