Sorry for the message flood.

The only solution I can think of is to factor out the full name stuff. For the problem this pr should fix that part isn't needed anyway.