BIP30 fix for branch of branch