fixed issues related to the transaction scope;