Hopeful fix on spamming both