Fix for transactions