diff --git a/changelog.txt b/changelog.txt
index 4886f066..a8564fa3 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,9 @@
+------------------------------------------------------
+Version 2.0.0-39
+------------------------------------------------------
+- Updated to 1.9.4!
+- Fixed the Trick Shot upgrade
+
 ------------------------------------------------------
 Version 2.0.0-38
 ------------------------------------------------------
diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
index 0a1dadea..ba4f9997 100644
--- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
+++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java
@@ -733,6 +733,11 @@ public class EventHandler
         ItemStack stack = event.getBow();
         EntityPlayer player = event.getEntityPlayer();
 
+        if (world.isRemote)
+        {
+            return;
+        }
+
         if (LivingArmour.hasFullSet(player))
         {
             ItemStack chestStack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
@@ -761,10 +766,13 @@ public class EventHandler
                     int numberExtra = ((LivingArmourUpgradeArrowShot) upgrade).getExtraArrows();
                     for (int n = 0; n < numberExtra; n++)
                     {
-                        ItemArrow itemarrow = (ItemArrow) Items.ARROW;
-                        EntityArrow entityarrow = itemarrow.createArrow(world, new ItemStack(Items.ARROW), player);
+                        ItemStack arrowStack = new ItemStack(Items.ARROW);
+                        ItemArrow itemarrow = (ItemArrow) ((ItemArrow) (stack.getItem() instanceof ItemArrow ? arrowStack.getItem() : Items.ARROW));
+                        EntityArrow entityarrow = itemarrow.createArrow(world, arrowStack, player);
+                        entityarrow.setAim(player, player.rotationPitch, player.rotationYaw, 0.0F, f * 3.0F, 1.0F);
+
+                        float velocityModifier = 0.6f * f;
 
-                        double velocityModifier = 0.6 * f;
                         entityarrow.motionX += (random.nextDouble() - 0.5) * velocityModifier;
                         entityarrow.motionY += (random.nextDouble() - 0.5) * velocityModifier;
                         entityarrow.motionZ += (random.nextDouble() - 0.5) * velocityModifier;
@@ -793,12 +801,12 @@ public class EventHandler
                             entityarrow.setFire(100);
                         }
 
-                        entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY;
-
-                        if (!world.isRemote)
+                        if (true)
                         {
-                            world.spawnEntityInWorld(entityarrow);
+                            entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY;
                         }
+
+                        world.spawnEntityInWorld(entityarrow);
                     }
                 }
             }