#58 TrustedWire fixed