diff --git a/libs/bukkit.jar b/libs/bukkit.jar
new file mode 100644
index 0000000..6049a36
Binary files /dev/null and b/libs/bukkit.jar differ
diff --git a/libs/craftbukkit164.jar b/libs/craftbukkit164.jar
new file mode 100644
index 0000000..875e5ab
Binary files /dev/null and b/libs/craftbukkit164.jar differ
diff --git a/src/com/cnaude/chairs/vehiclearrow/GetVehicleArrowClass.java b/src/com/cnaude/chairs/vehiclearrow/GetVehicleArrowClass.java
index aabf9c9..30d0afe 100644
--- a/src/com/cnaude/chairs/vehiclearrow/GetVehicleArrowClass.java
+++ b/src/com/cnaude/chairs/vehiclearrow/GetVehicleArrowClass.java
@@ -13,7 +13,8 @@ public class GetVehicleArrowClass {
         if (nmspackageversion.equals("v1_7_R1"))
         {
         	return Class.forName(pkgname+"."+"nms172"+"."+vehiclearrowclassname);
-        } else if (nmspackageversion.equals("v1_6_R3"))
+        } else 
+        if (nmspackageversion.equals("v1_6_R3"))
         {
         	return Class.forName(pkgname+"."+"nms164"+"."+vehiclearrowclassname);
         }
diff --git a/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java b/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
index 8ec8cf1..1444e0c 100644
--- a/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
+++ b/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
@@ -1,5 +1,25 @@
 package com.cnaude.chairs.vehiclearrow.nms164;
 
-public class VehicleArrow {
+import net.minecraft.server.v1_6_R3.EntityArrow;
+
+import org.bukkit.craftbukkit.v1_6_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_6_R3.entity.CraftArrow;
+import org.bukkit.entity.Vehicle;
+
+public class VehicleArrow extends CraftArrow implements Vehicle {
+
+	public VehicleArrow(CraftServer server, EntityArrow entity) 
+	{
+		super(server, entity);
+	}
+	
+	@Override
+	public void remove() 
+	{
+		if (this.getPassenger() == null) 
+		{
+			super.remove();
+		}
+	}
 
 }