Add fix for testnet