SONAR-4206 Fix transaction issue