Fix name tag not carrying over