sonar bugs corrected