Too long name bug fix