Adapt the tags here, too (see previous comment).