Added Transactiion workarround