Hopefully get names 100% of the time now