fixing the worst offenders