Fixed false positives in HasData