Fix for duplicate messages.