SONARPLUGINS-3282 Fix implementation that was not correct