Fixing a bug exposed by Exchange now being ConcurrentHashMap