Name length fix attempt 3