Fix bug related to water