Fixed issue in AND reported by Sonar