Fixed complexity for Sonar (yes, sonar, you keep me busy. thx a ton ;-)