diff --git a/library/src/main/base/com/google/android/cameraview/AspectRatio.java b/library/src/main/base/com/google/android/cameraview/AspectRatio.java
index d7f841d0..01f73be3 100644
--- a/library/src/main/base/com/google/android/cameraview/AspectRatio.java
+++ b/library/src/main/base/com/google/android/cameraview/AspectRatio.java
@@ -34,7 +34,7 @@ public class AspectRatio implements Comparable<AspectRatio>, Parcelable {
 
     /**
      * Returns an instance of {@link AspectRatio} specified by {@code x} and {@code y} values.
-     * The values {@code x} and {@code} will be reduced by their greatest common divider.
+     * The values {@code x} and {@code y} will be reduced by their greatest common divider.
      *
      * @param x The width
      * @param y The height
diff --git a/library/src/main/java/com/google/android/cameraview/CameraView.java b/library/src/main/java/com/google/android/cameraview/CameraView.java
index 04826d84..8c2d5ec6 100644
--- a/library/src/main/java/com/google/android/cameraview/CameraView.java
+++ b/library/src/main/java/com/google/android/cameraview/CameraView.java
@@ -132,8 +132,10 @@ private PreviewImpl createPreviewImpl(Context context) {
         PreviewImpl preview;
         if (Build.VERSION.SDK_INT < 14) {
             preview = new SurfaceViewPreview(context, this);
-        } else {
+        } else if (Build.VERSION.SDK_INT < 24){
             preview = new TextureViewPreview(context, this);
+        }else {
+            preview = new SurfaceViewPreview(context, this);
         }
         return preview;
     }