Fix issues with text trimming, take 1