Avoid more false positives