EUCA-8707 Fix to transaction issue