GPII-549: Fixing use of fluid.set