diff --git a/src/transaction_builder.js b/src/transaction_builder.js
index ad8c704..023591a 100644
--- a/src/transaction_builder.js
+++ b/src/transaction_builder.js
@@ -146,16 +146,19 @@ TransactionBuilder.prototype.__build = function(allowIncomplete) {
         scriptSig = scripts.pubKeyHashInput(signature, pubKey)
 
         break
+
       case 'multisig':
         var redeemScript = allowIncomplete ? undefined : input.redeemScript
         scriptSig = scripts.multisigInput(signatures, redeemScript)
 
         break
+
       case 'pubkey':
         var signature = signatures[0]
         scriptSig = scripts.pubKeyInput(signature)
 
         break
+
       default:
         assert(false, scriptType + ' not supported')
     }
@@ -214,6 +217,7 @@ TransactionBuilder.fromTransaction = function(transaction) {
         signatures = [parsed.signature]
 
         break
+
       case 'multisig':
         var scriptSigs = scriptSig.chunks.slice(1) // ignore OP_0
         var parsed = scriptSigs.map(function(scriptSig) {
@@ -225,6 +229,7 @@ TransactionBuilder.fromTransaction = function(transaction) {
         signatures = parsed.map(function(p) { return p.signature })
 
         break
+
       case 'pubkey':
         var parsed = ECSignature.parseScriptSignature(scriptSig.chunks[0])
 
@@ -233,6 +238,7 @@ TransactionBuilder.fromTransaction = function(transaction) {
         signatures = [parsed.signature]
 
         break
+
       default:
         assert(false, scriptType + ' not supported')
     }
diff --git a/test/transaction_builder.js b/test/transaction_builder.js
index 563e242..d6ab2f0 100644
--- a/test/transaction_builder.js
+++ b/test/transaction_builder.js
@@ -233,5 +233,30 @@ describe('TransactionBuilder', function() {
         assert.equal(txb.build().toHex(), f.txhex)
       })
     })
+
+    it('works for the P2SH multisig case', function() {
+      var privKeys = [
+        "91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgwmaKkrx",
+        "91avARGdfge8E4tZfYLoxeJ5sGBdNJQH4kvjJoQFacbgww7vXtT"
+      ].map(function(wif) { return ECKey.fromWIF(wif) })
+      var redeemScript = Script.fromASM("OP_2 0479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b8 04c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a OP_2 OP_CHECKMULTISIG")
+
+      txb.addInput("4971f016798a167331bcbc67248313fbc444c6e92e4416efd06964425588f5cf", 0)
+      txb.addOutput("1BgGZ9tcN4rm9KBzDn7KprQz87SZ26SAMH", 10000)
+      txb.sign(0, privKeys[0], redeemScript)
+
+      var tx = txb.buildIncomplete()
+
+      // in another galaxy...
+      // ... far, far away
+      var txb2 = TransactionBuilder.fromTransaction(tx)
+
+      // [you should] verify that Transaction is what you want...
+      // ... then sign it
+      txb2.sign(0, privKeys[1], redeemScript)
+      var tx2 = txb2.build()
+
+      assert.equal(tx2.toHex(), '0100000001cff58855426469d0ef16442ee9c644c4fb13832467bcbc3173168a7916f0714900000000fd1c01004830450221009c92c1ae1767ac04e424da7f6db045d979b08cde86b1ddba48621d59a109d818022004f5bb21ad72255177270abaeb2d7940ac18f1e5ca1f53db4f3fd1045647a8a8014830450221009418caa5bc18da87b188a180125c0cf06dce6092f75b2d3c01a29493466800fd02206ead65e7ca6e0f17eefe6f78457c084eab59af7c9882be1437de2e7116358eb9014c8752410479be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798483ada7726a3c4655da4fbfc0e1108a8fd17b448a68554199c47d08ffb10d4b84104c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee51ae168fea63dc339a3c58419466ceaeef7f632653266d0e1236431a950cfe52a52aeffffffff0110270000000000001976a914751e76e8199196d454941c45d1b3a323f1433bd688ac00000000')
+    })
   })
 })