FLUID-5511: one more fix