SONARVS-18 Correct the implementation