TRX deadlock fix
Roll 1.3.0