diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
index 3a9871762c..6f0b9423f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFireball.java
@@ -1,8 +1,9 @@
 package org.bukkit.craftbukkit.entity;
 
 import net.minecraft.server.EntityFireball;
-import net.minecraft.server.EntityLiving;
+import net.minecraft.server.MathHelper;
 
+import org.apache.commons.lang.Validate;
 import org.bukkit.craftbukkit.CraftServer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fireball;
@@ -49,7 +50,14 @@ public class CraftFireball extends AbstractProjectile implements Fireball {
     }
 
     public void setDirection(Vector direction) {
-        getHandle().setDirection(direction.getX(), direction.getY(), direction.getZ());
+        Validate.notNull(direction, "Direction can not be null");
+        double x = direction.getX();
+        double y = direction.getY();
+        double z = direction.getZ();
+        double magnitude = (double) MathHelper.sqrt(x * x + y * y + z * z);
+        getHandle().dirX = x / magnitude;
+        getHandle().dirY = y / magnitude;
+        getHandle().dirZ = z / magnitude;
     }
 
     @Override