all: better fix for TAG setup