GPII-177: Fixing an issue related to fluid.get call
Merge remote-tracking branch 'javihernandez/GPII-177' into v0.2

* javihernandez/GPII-177:
  GPII-177: Fixing an issue related to fluid.get call