diff --git a/src/main/java/com/romraider/maps/TableBitwiseSwitch.java b/src/main/java/com/romraider/maps/TableBitwiseSwitch.java
index 3a5644ae..26094db5 100644
--- a/src/main/java/com/romraider/maps/TableBitwiseSwitch.java
+++ b/src/main/java/com/romraider/maps/TableBitwiseSwitch.java
@@ -33,6 +33,7 @@ import javax.swing.JPanel;
 import javax.swing.JTextArea;
 
 import com.romraider.Settings;
+import com.romraider.maps.Table.TableType;
 import com.romraider.util.ByteUtil;
 
 import static com.romraider.util.ByteUtil.isBitSet;
@@ -46,7 +47,6 @@ public class TableBitwiseSwitch extends Table {
     public TableBitwiseSwitch() {
         super();
         storageType = 1;
-        type = Settings.TABLE_SWITCH;
         removeAll();
         setLayout(new BorderLayout());
         checkboxes = new ArrayList<JCheckBox>();
@@ -72,8 +72,8 @@ public class TableBitwiseSwitch extends Table {
     }
 
     @Override
-    public int getType() {
-        return Settings.TABLE_SWITCH;
+    public TableType getType() {
+        return Table.TableType.SWITCH;
     }
 
     @Override
diff --git a/src/main/java/com/romraider/swing/TablePropertyPanel.java b/src/main/java/com/romraider/swing/TablePropertyPanel.java
index 69b72a89..80ed2d5a 100644
--- a/src/main/java/com/romraider/swing/TablePropertyPanel.java
+++ b/src/main/java/com/romraider/swing/TablePropertyPanel.java
@@ -48,8 +48,10 @@ public class TablePropertyPanel extends javax.swing.JPanel {
     if (Table.TableType.SWITCH == table.getType()) {
         dim = 1;
         storageSize.setText("switch");
-        scrollPane.setViewportView(populateScalesTable(
-                ((TableSwitch) table).getSwitchStates()));
+        if(table.getClass() == TableSwitch.class) {
+            scrollPane.setViewportView(populateScalesTable(
+                    ((TableSwitch) table).getSwitchStates()));
+        }
     }
     else {
         if (Settings.STORAGE_TYPE_FLOAT == table.getStorageType()) {