Last fix (hopefully) for the robustness+variability check.