diff --git a/overviewer_core/src/overviewer.h b/overviewer_core/src/overviewer.h
index 1bb8f92..c9b7ae6 100644
--- a/overviewer_core/src/overviewer.h
+++ b/overviewer_core/src/overviewer.h
@@ -26,7 +26,7 @@
 
 // increment this value if you've made a change to the c extesion
 // and want to force users to rebuild
-#define OVERVIEWER_EXTENSION_VERSION 30
+#define OVERVIEWER_EXTENSION_VERSION 31
 
 /* Python PIL, and numpy headers */
 #include <Python.h>
diff --git a/overviewer_core/src/primitives/edge-lines.c b/overviewer_core/src/primitives/edge-lines.c
index dc3d1c1..00f12ae 100644
--- a/overviewer_core/src/primitives/edge-lines.c
+++ b/overviewer_core/src/primitives/edge-lines.c
@@ -38,6 +38,7 @@ edge_lines_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, P
         Imaging img_i = imaging_python_to_c(state->img);
         unsigned char ink[] = {0, 0, 0, 255 * self->opacity};
         unsigned short side_block;
+        int x = state->x, y = state->y, z = state->z;
 
         int increment=0;
         if (state->block == 44 && ((state->block_data & 0x8) == 0 ))  // half-step BUT no upsidown half-step
@@ -46,15 +47,15 @@ edge_lines_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, P
             increment=9;
         
         /* +X side */
-        side_block = get_data(state, BLOCKS, state->x+1, state->y, state->z);
-        if (side_block != state->block && is_transparent(side_block)) {
+        side_block = get_data(state, BLOCKS, x+1, y, z);
+        if (side_block != state->block && (is_transparent(side_block) || render_mode_hidden(state->rendermode, x+1, y, z))) {
             ImagingDrawLine(img_i, state->imgx+12, state->imgy+1+increment, state->imgx+22+1, state->imgy+5+1+increment, &ink, 1);
             ImagingDrawLine(img_i, state->imgx+12, state->imgy+increment, state->imgx+22+1, state->imgy+5+increment, &ink, 1);
         }
         
         /* -Z side */
-        side_block = get_data(state, BLOCKS, state->x, state->y, state->z-1);
-        if (side_block != state->block && is_transparent(side_block)) {
+        side_block = get_data(state, BLOCKS, x, y, z-1);
+        if (side_block != state->block && (is_transparent(side_block) || render_mode_hidden(state->rendermode, x, y, z-1))) {
             ImagingDrawLine(img_i, state->imgx, state->imgy+6+1+increment, state->imgx+12+1, state->imgy+1+increment, &ink, 1);
             ImagingDrawLine(img_i, state->imgx, state->imgy+6+increment, state->imgx+12+1, state->imgy+increment, &ink, 1);
         }
diff --git a/overviewer_core/src/primitives/hide.c b/overviewer_core/src/primitives/hide.c
index 5444e82..cdb24e8 100644
--- a/overviewer_core/src/primitives/hide.c
+++ b/overviewer_core/src/primitives/hide.c
@@ -84,15 +84,21 @@ static int
 hide_hidden(void *data, RenderState *state, int x, int y, int z) {
     RenderPrimitiveHide *self = (RenderPrimitiveHide *)data;
     unsigned int i;
+    unsigned short block;
     
     if (self->rules == NULL)
         return 0;
     
+    block = get_data(state, BLOCKS, x, y, z);
     for (i = 0; self->rules[i].blockid != 0; i++) {
-        if (state->block == self->rules[i].blockid) {
+        if (block == self->rules[i].blockid) {
+            unsigned char data;
+            
             if (!(self->rules[i].has_data))
                 return 1;
-            if (state->block_data == self->rules[i].data)
+            
+            data = get_data(state, DATA, x, y, z);
+            if (data == self->rules[i].data)
                 return 1;
         }
     }