Fixing spam issues for real this time.