Tried to fix false positives and negatives