diff --git a/firmware/transaction.c b/firmware/transaction.c
index 4e16f5573..d84b2ac64 100644
--- a/firmware/transaction.c
+++ b/firmware/transaction.c
@@ -135,10 +135,10 @@ bool compute_address(const CoinInfo *coin,
 			raw[0] = 0; // push version
 			raw[1] = 32; // push 32 bytes
 			memcpy(raw + 2, digest, 32); // push hash
-			hasher_Raw(coin->curve->hasher_multisig, raw, 34, digest);
+			hasher_Raw(coin->curve->hasher_pubkey, raw, 34, digest);
 			prelen = address_prefix_bytes_len(coin->address_type_p2sh);
 			address_write_prefix_bytes(coin->address_type_p2sh, raw);
-			ripemd160(digest, 32, raw + prelen);
+			memcpy(raw + prelen, digest, 32);
 			if (!base58_encode_check(raw, prelen + 20, coin->curve->hasher_base58, address, MAX_ADDR_SIZE)) {
 				return 0;
 			}
@@ -364,7 +364,7 @@ uint32_t compile_script_multisig_hash(const CoinInfo *coin, const MultisigRedeem
 	if (n < 1 || n > 15) return 0;
 
 	Hasher hasher;
-	hasher_Init(&hasher, coin->curve->hasher_multisig);
+	hasher_Init(&hasher, coin->curve->hasher_script);
 
 	uint8_t d[2];
 	d[0] = 0x50 + m; hasher_Update(&hasher, d, 1);
diff --git a/vendor/trezor-crypto b/vendor/trezor-crypto
index f9caee248..b679a6b2a 160000
--- a/vendor/trezor-crypto
+++ b/vendor/trezor-crypto
@@ -1 +1 @@
-Subproject commit f9caee2489aa1ca8a3380c9fc79465a83c848b7f
+Subproject commit b679a6b2a73ed8adfe236cfa0ba73c5d86661633