Added missing code after tagging