Fixed too long name problem