Fix type when tagging is disabled