Bugfix: water IS safe