FLUID-4908: Improved code in a ginger way.