Patch to prevent 'start spamming'