Added additional AND to avoid FPs

One additional missing AND test from the last commit to avoid FPs