Fix text stripping iussues