diff --git a/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java b/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
index 472859e..9bde3c1 100644
--- a/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
+++ b/src/com/cnaude/chairs/vehiclearrow/nms164/VehicleArrow.java
@@ -14,7 +14,7 @@ public class VehicleArrow extends CraftArrow implements Vehicle {
 
 	@Override
 	public void remove() {
-		if (this.getPassenger() == null) {
+		if (isEmpty()) {
 			super.remove();
 		}
 	}
diff --git a/src/com/cnaude/chairs/vehiclearrow/nms172/VehicleArrow.java b/src/com/cnaude/chairs/vehiclearrow/nms172/VehicleArrow.java
index a37a3f4..13d1a60 100644
--- a/src/com/cnaude/chairs/vehiclearrow/nms172/VehicleArrow.java
+++ b/src/com/cnaude/chairs/vehiclearrow/nms172/VehicleArrow.java
@@ -14,7 +14,7 @@ public class VehicleArrow extends CraftArrow implements Vehicle {
 
 	@Override
 	public void remove() {
-		if (this.getPassenger() == null) {
+		if (isEmpty()) {
 			super.remove();
 		}
 	}