Fixed false positives for valid?