Fluid bugfix [#8395] [#6200]: this should solve the