GBC : fixing rules (sonar) 2