Fix the tag issue when sending