diff --git a/client/render/BaseBlockRender.java b/client/render/BaseBlockRender.java
index b068301a4..f5afeba12 100644
--- a/client/render/BaseBlockRender.java
+++ b/client/render/BaseBlockRender.java
@@ -444,6 +444,12 @@ public class BaseBlockRender
 	{
 		if ( forward != null && up != null )
 		{
+			if ( forward == ForgeDirection.UNKNOWN )
+				forward = ForgeDirection.SOUTH;
+
+			if ( up == ForgeDirection.UNKNOWN )
+				up = ForgeDirection.UP;
+
 			ForgeDirection west = Platform.crossProduct( forward, up );
 
 			rotMat.put( 0, west.offsetX );
diff --git a/tile/AEBaseTile.java b/tile/AEBaseTile.java
index fb3f1de55..7ed55c075 100644
--- a/tile/AEBaseTile.java
+++ b/tile/AEBaseTile.java
@@ -216,16 +216,12 @@ public class AEBaseTile extends TileEntity implements IOrientable, ICommonTile
 	@Override
 	public ForgeDirection getForward()
 	{
-		if ( forward == ForgeDirection.UNKNOWN )
-			return ForgeDirection.SOUTH;
 		return forward;
 	}
 
 	@Override
 	public ForgeDirection getUp()
 	{
-		if ( up == ForgeDirection.UNKNOWN )
-			return ForgeDirection.UP;
 		return up;
 	}