diff --git a/beacon_chain/eth2_discovery.nim b/beacon_chain/eth2_discovery.nim
index 931e850d9..5b0a52dca 100644
--- a/beacon_chain/eth2_discovery.nim
+++ b/beacon_chain/eth2_discovery.nim
@@ -96,6 +96,5 @@ proc new*(T: type Eth2DiscoveryProtocol,
   if fileExists(persistentBootstrapFile):
     loadBootstrapFile(persistentBootstrapFile, bootstrapEnrs, ourPubKey)
 
-  let enrFieldPairs = mapIt(enrFields, toFieldPair(it[0], it[1]))
   newProtocol(
-    pk, db, ip, tcpPort, udpPort, enrFieldPairs, bootstrapEnrs, rng = rng)
+    pk, db, ip, tcpPort, udpPort, enrFields, bootstrapEnrs, rng = rng)
diff --git a/beacon_chain/inspector.nim b/beacon_chain/inspector.nim
index b816030cf..4a28325d0 100644
--- a/beacon_chain/inspector.nim
+++ b/beacon_chain/inspector.nim
@@ -408,14 +408,12 @@ proc bootstrapDiscovery(conf: InspectorConf,
   let udpPort = Port(conf.discoveryPort)
   let tcpPort = Port(conf.ethPort)
   let host = host.toIpAddress()
-  var pairs: seq[FieldPair]
   if enrFields.isSome():
     let fields = enrFields.get()
-    pairs = @[toFieldPair("eth2", fields.eth2),
-              toFieldPair("attnets", fields.attnets)]
+    let pairs = {"eth2": fields.eth2, "attnets": fields.attnets}
+    result = newProtocol(pk, db, host, tcpPort, udpPort, pairs, bootnodes)
   else:
-    pairs = @[]
-  result = newProtocol(pk, db, host, tcpPort, udpPort, pairs, bootnodes)
+    result = newProtocol(pk, db, host, tcpPort, udpPort, [], bootnodes)
   result.open()
   result.start()
 
diff --git a/vendor/nim-eth b/vendor/nim-eth
index 484fbcab1..8d2614a1a 160000
--- a/vendor/nim-eth
+++ b/vendor/nim-eth
@@ -1 +1 @@
-Subproject commit 484fbcab1b25072b4c45f496a88d361fc9479be4
+Subproject commit 8d2614a1ad503952cf8a101ad1a9042107f33d6c