Changes to fix start stop transaction error