diff --git a/node/src/chain_spec/gdev.rs b/node/src/chain_spec/gdev.rs
index 47f194db3b44e3316ba281f1addb2536198f27c2..4a67d01bb5f429b9133cc6049a38815d59b7ff4d 100644
--- a/node/src/chain_spec/gdev.rs
+++ b/node/src/chain_spec/gdev.rs
@@ -18,12 +18,11 @@ use super::*;
 use common_runtime::constants::*;
 use common_runtime::entities::IdtyData;
 use common_runtime::*;
-use gdev_runtime::BalancesConfig;
 use gdev_runtime::{
-    opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, CertConfig,
-    GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, ParametersConfig, SessionConfig,
-    SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
-    UniversalDividendConfig, WASM_BINARY,
+    opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig,
+    BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig,
+    ParametersConfig, SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig,
+    SystemConfig, TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY,
 };
 use sc_service::ChainType;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
diff --git a/node/src/chain_spec/gtest.rs b/node/src/chain_spec/gtest.rs
index f5f0961fb4655f65b9d01e29dcf11817e15f3329..2f742abdc4c327995bd0fbf1294323a9b1a2182d 100644
--- a/node/src/chain_spec/gtest.rs
+++ b/node/src/chain_spec/gtest.rs
@@ -20,14 +20,14 @@ use common_runtime::entities::IdtyData;
 use common_runtime::*;
 use gtest_genesis::{build_genesis, GenesisJson};
 use gtest_runtime::{
-    opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig, CertConfig,
-    GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig, SessionConfig, SmithCertConfig,
-    SmithMembershipConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig,
-    UniversalDividendConfig, WASM_BINARY,
+    opaque::SessionKeys, AccountConfig, AccountId, AuthorityMembersConfig, BabeConfig,
+    BalancesConfig, CertConfig, GenesisConfig, IdentityConfig, ImOnlineId, MembershipConfig,
+    SessionConfig, SmithCertConfig, SmithMembershipConfig, SudoConfig, SystemConfig,
+    TechnicalCommitteeConfig, UniversalDividendConfig, WASM_BINARY,
 };
 use jsonrpsee::core::JsonValue;
 use sc_consensus_grandpa::AuthorityId as GrandpaId;
-use sc_network_common::config::MultiaddrWithPeerId; // in the future available in sc_network::config
+use sc_network::config::MultiaddrWithPeerId;
 use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use serde::Deserialize;
@@ -272,6 +272,7 @@ fn generate_genesis(
     assert!(initial_authorities_len <= initial_smiths_len);
 
     let ud = 1_000;
+    let monetary_mass = initial_identities_len as u64 * ud;
 
     let initial_smiths = (0..initial_smiths_len)
         .map(|i| get_authority_keys_from_seed(NAMES[i]))
@@ -316,12 +317,7 @@ fn generate_genesis(
         },
         // Necessary to initialize TotalIssuence
         balances: BalancesConfig {
-            // FIXME
-            balances: initial_identities
-                .iter()
-                .enumerate()
-                .map(|(_, (_, key))| (key.clone(), first_ud))
-                .collect(),
+            total_issuance: monetary_mass,
         },
         babe: BabeConfig {
             authorities: Vec::with_capacity(0),