Should encode from name properly as well