fixed message spamming