diff --git a/src/main/java/com/lulan/shincolle/block/BlockWaypoint.java b/src/main/java/com/lulan/shincolle/block/BlockWaypoint.java
index 4e6e8ec7..a3ade6ca 100644
--- a/src/main/java/com/lulan/shincolle/block/BlockWaypoint.java
+++ b/src/main/java/com/lulan/shincolle/block/BlockWaypoint.java
@@ -218,7 +218,7 @@ public boolean removedByPlayer(IBlockState state, World world, BlockPos pos, Ent
         //check owner
         if (EntityHelper.checkOP(player) || BlockHelper.checkTileOwner(player, world.getTileEntity(pos))) {
             //server side
-            if (!world.isRemote) {
+            if (!world.isRemote && !player.isCreative()) {
                 ItemStack stack = new ItemStack(Item.getItemFromBlock(this));
 
                 //inventory is full, drop item onto ground
diff --git a/src/main/java/com/lulan/shincolle/client/render/block/RenderWaypoint.java b/src/main/java/com/lulan/shincolle/client/render/block/RenderWaypoint.java
index 37fba270..ee4fc040 100644
--- a/src/main/java/com/lulan/shincolle/client/render/block/RenderWaypoint.java
+++ b/src/main/java/com/lulan/shincolle/client/render/block/RenderWaypoint.java
@@ -50,6 +50,8 @@ public void render(TileEntityWaypoint te, double x, double y, double z, float pa
         GlStateManager.pushMatrix();
         GlStateManager.depthMask(ConfigHandler.vortexDepth);
         GlStateManager.translate((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.5F);
+        GlStateManager.rotate(yaw * 57.2957F, 0F, 1F, 0F);
+        GlStateManager.rotate(pitch * 57.2957F, 1F, 0F, 0F);
         this.model_waypoint.render(0.03125F);
         GlStateManager.depthMask(true);
         GlStateManager.popMatrix();