Try to fix normalization sonar issues