FLUID-4686: fixed regression with the timing of the store set.