Transaction scope fixed