Added string compare check to prevent false positives