SONARDOTNT-317 Fix the false positives