diff --git a/Rewrite/Magento/Framework/Phrase/Renderer/Translate.php b/Plugin/Magento/Framework/Phrase/Renderer/Translate.php
similarity index 87%
rename from Rewrite/Magento/Framework/Phrase/Renderer/Translate.php
rename to Plugin/Magento/Framework/Phrase/Renderer/Translate.php
index 90faa90..d63f839 100644
--- a/Rewrite/Magento/Framework/Phrase/Renderer/Translate.php
+++ b/Plugin/Magento/Framework/Phrase/Renderer/Translate.php
@@ -6,21 +6,25 @@
 
 declare(strict_types=1);
 
-namespace Magefan\Translation\Rewrite\Magento\Framework\Phrase\Renderer;
+namespace Magefan\Translation\Plugin\Magento\Framework\Phrase\Renderer;
 
 
 class Translate extends \Magento\Framework\Phrase\Renderer\Translate
 {
 
     /**
-     * Render source text
+     * Render source text fix for \n \rn
      *
      * @return string
      * @throws \Exception
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function render(array $source, array $arguments)
-    {
+    public function aroundRender(
+        \Magento\Framework\Phrase\Renderer\Translate $subject,
+        callable $proceed,
+        array $source,
+        array $arguments
+    ){
         $text = end($source);
         /* If phrase contains escaped quotes then use translation for phrase with non-escaped quote */
         $text = strtr($text, ['\"' => '"', "\\'" => "'"]);
diff --git a/etc/di.xml b/etc/di.xml
index 87d1eaf..d179971 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -15,8 +15,6 @@
                 type="Magefan\Translation\Model\TranslationRepository" />
     <preference for="Magefan\Translation\Api\ConfigInterface"
                 type="Magefan\Translation\Model\Config" />
-    <preference for="Magento\Framework\Phrase\Renderer\Translate"
-                type="Magefan\Translation\Rewrite\Magento\Framework\Phrase\Renderer\Translate"/>
     <virtualType name="TranslationGridDataProvider" type="Magento\Framework\View\Element\UiComponent\DataProvider\DataProvider">
         <arguments>
             <argument name="collection" xsi:type="object" shared="false">Magefan\Translation\Model\ResourceModel\Translation\Collection</argument>
@@ -51,4 +49,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Phrase\Renderer\Translate">
+        <plugin name="magefan_translation_renderer_translate_plugin"
+                type="Magefan\Translation\Plugin\Magento\Framework\Phrase\Renderer\Translate"
+                sortOrder="10" />
+    </type>
 </config>