diff --git a/light/trace.c b/light/trace.c
index e3367c8d..dda24036 100644
--- a/light/trace.c
+++ b/light/trace.c
@@ -151,7 +151,7 @@ TraceLine(const dmodel_t *model, const int traceflags,
 		if (hitpoint) {
 		    hitpoint->dplane = crossnode->plane;
 		    hitpoint->side = crossnode->side;
-		    VectorCopy(crossnode->back, hitpoint->point);
+		    VectorCopy(crossnode->front, hitpoint->point);
 		}
 		return tracehit;
 	    }
@@ -187,11 +187,11 @@ TraceLine(const dmodel_t *model, const int traceflags,
 	    break;
 	}
 
-	if (frontdist > ON_EPSILON && backdist > ON_EPSILON) {
+	if (frontdist > -ON_EPSILON && backdist > -ON_EPSILON) {
 	    node = tnode->children[0];
 	    continue;
 	}
-	if (frontdist < -ON_EPSILON && backdist < -ON_EPSILON) {
+	if (frontdist < ON_EPSILON && backdist < ON_EPSILON) {
 	    node = tnode->children[1];
 	    continue;
 	}