Apply similar fix as needed for AMQNET-298
2 files changed