diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt
index 8428cd1d..f71457d3 100644
--- a/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt
+++ b/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt
@@ -89,7 +89,7 @@ class DefaultThumbnailsEngine(
         }
 
         override fun isDrained(): Boolean {
-            if(source.isDrained) {
+            if (source.isDrained) {
                 source.seekTo(stubs.firstOrNull()?.positionUs ?: -1)
             }
             return source.isDrained
@@ -121,18 +121,16 @@ class DefaultThumbnailsEngine(
                 val nextKeyFrameUs =
                     if (nextKeyFrameIndex == -1) Long.MAX_VALUE else source.keyFrameTimestampsUs[nextKeyFrameIndex]
                 val previousKeyFrameUs =
-                    if (nextKeyFrameIndex > 0) {
-                        source.keyFrameTimestampsUs[nextKeyFrameIndex - 1]
-                    }
-                    else {
-                        source.keyFrameTimestampsUs[source.keyFrameTimestampsUs.size - 1]
-                    }
+                    source.keyFrameTimestampsUs[
+                        if (nextKeyFrameIndex > 0)
+                            nextKeyFrameIndex - 1 else (source.keyFrameTimestampsUs.size - 1)
+                    ]
 
                 log.i(
                     "seek: current ${source.positionUs}," +
                         " requested $requested, threshold $threshold, nextKeyFrameUs $nextKeyFrameUs"
                 )
-                
+
                 val rightGap = nextKeyFrameUs - requested
                 val nextKeyFrameInThreshold = rightGap <= threshold
                 seek = nextKeyFrameInThreshold || previousKeyFrameUs > current || (current - requested > threshold)
@@ -172,7 +170,7 @@ class DefaultThumbnailsEngine(
 
     private lateinit var progress: (Thumbnail) -> Unit
 
-    private fun DataSource.search(timestampUs: Long) : Int {
+    private fun DataSource.search(timestampUs: Long): Int {
         if (keyFrameTimestampsUs.isEmpty())
             requestKeyFrameTimestamps()
 
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/SingleThumbnailRequest.kt b/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/SingleThumbnailRequest.kt
index 9f4036af..a40812ee 100644
--- a/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/SingleThumbnailRequest.kt
+++ b/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/SingleThumbnailRequest.kt
@@ -1,9 +1,10 @@
 package com.otaliastudios.transcoder.thumbnail
 
+@Suppress("MagicNumber")
 open class SingleThumbnailRequest(private val positionUs: Long) : ThumbnailRequest {
     override fun locate(durationUs: Long): List<Long> {
-//        val positionUs = positionUs.coerceIn(0L..durationUs)
-        val positionUs = positionUs.coerceIn(0L..durationUs - 135005 - (positionUs / 1000) % 10000)
+        val randomizer = (positionUs / 1000) % 10000
+        val positionUs = positionUs.coerceIn(0L..durationUs - 135005 - randomizer)
         return listOf(positionUs)
     }
 }