SONARFLEX-3 Fix implementation.