Added extra filtering to remove false positive