Fix dependence on tag module