Handle a trailing dot in the name?