Work around for com_tags bug