Fixing water collision