Some little change required by sonar