Fixing spam control