diff --git a/src/main/java/com/romraider/maps/DataCell.java b/src/main/java/com/romraider/maps/DataCell.java
index b4140a11..e5b8b158 100644
--- a/src/main/java/com/romraider/maps/DataCell.java
+++ b/src/main/java/com/romraider/maps/DataCell.java
@@ -500,7 +500,7 @@ public class DataCell extends JLabel implements MouseListener, Serializable {
     }
 
     public String getStaticText() {
-        String displayString = "";
+        String displayString = null;
         try {
             DecimalFormat formatter = new DecimalFormat(table.getCurrentScale().getFormat());
 
diff --git a/src/main/java/com/romraider/maps/Table1D.java b/src/main/java/com/romraider/maps/Table1D.java
index 07546d8b..21a11ebb 100644
--- a/src/main/java/com/romraider/maps/Table1D.java
+++ b/src/main/java/com/romraider/maps/Table1D.java
@@ -194,7 +194,17 @@ public class Table1D extends Table {
 
             int startIdx = data.length;
             for (int i = 0; i < data.length; i++) {
-                double currentValue = data[i].getRealValue();
+                double currentValue = 0.0;
+                if(isStaticDataTable() && null != data[i].getStaticText()) {
+                    try {
+                        currentValue = Double.parseDouble(data[i].getStaticText());
+                    } catch(NumberFormatException nex) {
+                        return;
+                    }
+                } else {
+                    currentValue = data[i].getRealValue();
+                }
+
                 if (liveValue == currentValue) {
                     startIdx = i;
                     break;
diff --git a/src/main/java/com/romraider/maps/Table3D.java b/src/main/java/com/romraider/maps/Table3D.java
index bdfc109f..06df5fed 100644
--- a/src/main/java/com/romraider/maps/Table3D.java
+++ b/src/main/java/com/romraider/maps/Table3D.java
@@ -791,7 +791,7 @@ public class Table3D extends Table {
 
     @Override
     public void highlightLiveData(String liveValue) {
-        if (overlayLog) {
+        if (getOverlayLog()) {
             int x = xAxis.getLiveDataIndex();
             int y = yAxis.getLiveDataIndex();
             DataCell cell = data[x][y];
@@ -801,8 +801,9 @@ public class Table3D extends Table {
         }
     }
 
+    @Override
     public void updateLiveDataHighlight() {
-        if (overlayLog) {
+        if (getOverlayLog()) {
             int x = xAxis.getLiveDataIndex();
             int y = yAxis.getLiveDataIndex();
             data[x][y].setLiveDataTrace(true);