Fix tagging bug