Attempt 2 to fix the name length issue