SONARJS-291 First attempt to fix performance issue