Fixed a bug with fluid update
Fixed a bug with the fluid issue
Merge branch 'develop' into staging