Fix name length issue