diff --git a/src/main/java/com/flansmod/common/tools/EntityParachute.java b/src/main/java/com/flansmod/common/tools/EntityParachute.java
index 06b8e4d0e..60a533b95 100644
--- a/src/main/java/com/flansmod/common/tools/EntityParachute.java
+++ b/src/main/java/com/flansmod/common/tools/EntityParachute.java
@@ -1,5 +1,8 @@
 package com.flansmod.common.tools;
 
+import javax.annotation.Nullable;
+import java.util.List;
+
 import io.netty.buffer.ByteBuf;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
@@ -94,6 +97,14 @@ protected void entityInit()
 	{
 	}
 	
+	@Nullable
+	@Override
+	public Entity getControllingPassenger()
+	{
+		List<Entity> list = this.getPassengers();
+		return list.isEmpty() ? null : list.get(0);
+	}
+	
 	@Override
 	protected void readEntityFromNBT(NBTTagCompound tags)
 	{