Fix full name support, thanks zandbelt (#1578)