Fixing spam bug