Fixed: Don't send duplicate messages