Fix ping tagging