Fix water detection by units