Improved the checks, there shouldn't be that much false positives now.