should fix #6099
Merge pull request #6103 from Walter0o/water_fix

should fix #6099