simple patch to avoid race condition discussed in Moore#438 (closed). Only meant as a solution to enable the rate test until the proper fix in !3528 (merged) is ready.
cc @shunan @graven @nskidmor