Another fix for the robustness with variability is here. Now it should
work correctly.