diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs
index 9ea9f86998..56ac26b4e8 100644
--- a/substrate/node/runtime/src/lib.rs
+++ b/substrate/node/runtime/src/lib.rs
@@ -61,7 +61,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_name: create_runtime_str!("substrate-node"),
 	authoring_version: 10,
 	spec_version: 30,
-	impl_version: 31,
+	impl_version: 32,
 	apis: RUNTIME_API_VERSIONS,
 };
 
diff --git a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
index bde6c26372..01b649f546 100644
Binary files a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm and b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm differ
diff --git a/substrate/srml/contract/src/lib.rs b/substrate/srml/contract/src/lib.rs
index 9073c9b98d..90cccfce79 100644
--- a/substrate/srml/contract/src/lib.rs
+++ b/substrate/srml/contract/src/lib.rs
@@ -69,7 +69,7 @@ use crate::account_db::AccountDb;
 use serde_derive::{Serialize, Deserialize};
 use rstd::prelude::*;
 use rstd::marker::PhantomData;
-use parity_codec::Codec;
+use parity_codec::{Codec, Encode};
 use parity_codec_derive::{Encode, Decode};
 use runtime_primitives::traits::{Hash, As, SimpleArithmetic,Bounded, StaticLookup};
 use srml_support::dispatch::{Result, Dispatchable};
@@ -140,7 +140,7 @@ where
 pub struct DefaultDispatchFeeComputor<T: Trait>(PhantomData<T>);
 impl<T: Trait> ComputeDispatchFee<T::Call, T::Balance> for DefaultDispatchFeeComputor<T> {
 	fn compute_dispatch_fee(call: &T::Call) -> T::Balance {
-		let encoded_len = parity_codec::Encode::encode(&call).len();
+		let encoded_len = call.using_encoded(|encoded| encoded.len());
 		let base_fee = <fees::Module<T>>::transaction_base_fee();
 		let byte_fee = <fees::Module<T>>::transaction_byte_fee();
 		<T::Balance as As<u64>>::sa(base_fee.as_() + byte_fee.as_() * encoded_len as u64)
diff --git a/substrate/srml/support/src/double_map.rs b/substrate/srml/support/src/double_map.rs
index e62b6518d6..bd3fd973c2 100644
--- a/substrate/srml/support/src/double_map.rs
+++ b/substrate/srml/support/src/double_map.rs
@@ -101,7 +101,7 @@ pub trait StorageDoubleMap {
 	{
 		let mut raw_prefix = Vec::new();
 		raw_prefix.extend(Self::PREFIX);
-		raw_prefix.extend(Encode::encode(&key));
+		key.encode_to(&mut raw_prefix);
 		raw_prefix
 	}