Fixed issue with name not being populated