diff --git a/src/main/java/biomesoplenty/api/entity/BOPEntities.java b/src/main/java/biomesoplenty/api/entity/BOPEntities.java
index f5d27ee78..9abe3b7f5 100644
--- a/src/main/java/biomesoplenty/api/entity/BOPEntities.java
+++ b/src/main/java/biomesoplenty/api/entity/BOPEntities.java
@@ -7,10 +7,9 @@
  ******************************************************************************/
 package biomesoplenty.api.entity;
 
-import biomesoplenty.common.entity.item.BoatEntityBOP;
 import net.minecraft.entity.EntityType;
 
 public class BOPEntities
 {
-    public static EntityType<BoatEntityBOP> boat_bop;
+    public static EntityType<?> boat_bop;
 }
diff --git a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java
index 6fb36264b..551de7e36 100644
--- a/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java
+++ b/src/main/java/biomesoplenty/common/entity/item/BoatEntityBOP.java
@@ -6,6 +6,7 @@ import biomesoplenty.api.item.BOPItems;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LilyPadBlock;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
@@ -76,7 +77,7 @@ public class BoatEntityBOP extends Entity {
     private float rockingAngle;
     private float prevRockingAngle;
 
-    public BoatEntityBOP(EntityType<BoatEntityBOP> p_i50129_1_, World p_i50129_2_) {
+    public BoatEntityBOP(EntityType<?> p_i50129_1_, World p_i50129_2_) {
         super(p_i50129_1_, p_i50129_2_);
         this.preventEntitySpawning = true;
     }
@@ -272,6 +273,15 @@ public class BoatEntityBOP extends Entity {
      */
     @Override
     public void tick() {
+        if (this.world.isRemote) {
+            Entity rider = getControllingPassenger();
+            if (rider instanceof PlayerEntity) {
+                ClientPlayerEntity player = (ClientPlayerEntity) rider;
+                updateInputs(player.movementInput.leftKeyDown, player.movementInput.rightKeyDown, player.movementInput.forwardKeyDown, player.movementInput.backKeyDown);
+                player.rowingBoat |= player.movementInput.leftKeyDown || player.movementInput.rightKeyDown || player.movementInput.forwardKeyDown || player.movementInput.backKeyDown;
+            }
+        }
+
         this.previousStatus = this.status;
         this.status = this.getBoatStatus();
         if (this.status != BoatEntityBOP.Status.UNDER_WATER && this.status != BoatEntityBOP.Status.UNDER_FLOWING_WATER) {
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
index cde6def2c..8976f7b23 100644
--- a/src/main/resources/META-INF/accesstransformer.cfg
+++ b/src/main/resources/META-INF/accesstransformer.cfg
@@ -16,3 +16,5 @@ public-f net.minecraft.item.AxeItem field_203176_a # BLOCK_STRIPPING_MAP
 # server.properties world type hackery
 public-f net.minecraft.server.dedicated.ServerProperties *
 public net.minecraft.server.dedicated.PropertyManager *
+
+public net.minecraft.client.entity.player.ClientPlayerEntity field_184844_co # rowingBoat