Resolve Text stack overflow