diff --git a/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java b/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java
index 9dadeb9dd..f16eb76f3 100644
--- a/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java
+++ b/folioreader/src/main/java/com/folioreader/activity/FolioActivity.java
@@ -25,7 +25,6 @@
 import android.os.Handler;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.animation.LinearInterpolator;
@@ -239,7 +238,10 @@ public void onConfigChange() {
         ((FolioPageFragment) page).reload();
         if (position < mSpineReferences.size()) {
             page = getFragment(position + 1);
-            ((FolioPageFragment) page).reload();
+            if(page!=null) {
+                ((FolioPageFragment) page).reload();
+            }
+
         }
     }
 
diff --git a/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java b/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java
index a4618f8d4..a3a15e091 100644
--- a/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java
+++ b/folioreader/src/main/java/com/folioreader/fragments/FolioPageFragment.java
@@ -607,6 +607,7 @@ private String getHtmlContent(String htmlContent) {
         ArrayList<Highlight> highlights =
                 (ArrayList<Highlight>) HighlightTable.getAllHighlight(getActivity().
                         getApplication(), mBook.getTitle(), mPosition);
+
         for (Highlight highlight : highlights) {
             String highlightStr =
                     "<highlight id=\"" + highlight.getHighlightId() +
@@ -614,7 +615,7 @@ private String getHtmlContent(String htmlContent) {
                             highlight.getType() + "\">" + highlight.getContent() + "</highlight>";
             String searchStr = highlight.getContentPre() +
                     "" + highlight.getContent() + "" + highlight.getContentPost();
-            htmlContent = htmlContent.replace(searchStr, highlightStr);
+            htmlContent = htmlContent.replaceFirst(searchStr, highlightStr);
         }
         return htmlContent;
     }
diff --git a/sample/res/raw/nuevounitled.epub b/sample/res/raw/nuevounitled.epub
new file mode 100644
index 000000000..9ae26ce61
Binary files /dev/null and b/sample/res/raw/nuevounitled.epub differ
diff --git a/sample/src/main/assets/1rosecsem1.epub b/sample/src/main/assets/1rosecsem1.epub
new file mode 100644
index 000000000..629a5f104
Binary files /dev/null and b/sample/src/main/assets/1rosecsem1.epub differ
diff --git a/sample/src/main/assets/The Silver Chair2.epub b/sample/src/main/assets/The Silver Chair2.epub
new file mode 100644
index 000000000..875229679
Binary files /dev/null and b/sample/src/main/assets/The Silver Chair2.epub differ
diff --git a/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java b/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java
index 0e58872b2..e0301e0d6 100644
--- a/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java
+++ b/sample/src/main/java/comfolioreader/android/sample/HomeActivity.java
@@ -49,7 +49,7 @@ public void onClick(View v) {
                 if (ContextCompat.checkSelfPermission(HomeActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
                     ActivityCompat.requestPermissions(HomeActivity.this, WRITE_EXTERNAL_STORAGE_PERMS, GALLERY_REQUEST);
                 } else {
-                    openEpub(FolioActivity.EpubSourceType.ASSESTS,"nuevounitled.epub",0);
+                    openEpub(FolioActivity.EpubSourceType.ASSESTS,"1rosecsem1.epub",0);
                 }
             }
         });