diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..5559033
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,6 @@
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+D00Med <heiselong@gmx.com>
+zaoqi <zaoqiff@gmail.com>
diff --git a/api.lua b/api.lua
index 002be32..9f802a1 100644
--- a/api.lua
+++ b/api.lua
@@ -218,7 +218,7 @@ function vehicles.object_drive(entity, dtime, def)
 		entity.object:setvelocity({x=velo.x*0.9, y=velo.y+5, z=velo.z*0.9})
 	elseif is_watercraft and entity.on_water == false then
 		entity.object:setvelocity({x=velo.x*decell,y=velo.y-1,z=velo.z*decell})
-	elseif entity.on_water and not is_watercraft then
+	elseif (entity.on_water or entity.in_water) and not is_watercraft then
 		entity.object:setvelocity({x=velo.x*0.9, y=-1, z=velo.z*0.9})
 	--boost
 	elseif ctrl.up and not shoots2 and ctrl.aux1 and entity.boost then