diff --git a/MediaServiceCore b/MediaServiceCore
index d39037738..8fd47bb25 160000
--- a/MediaServiceCore
+++ b/MediaServiceCore
@@ -1 +1 @@
-Subproject commit d390377380a14994dbb94ff7fc0364e4612b060a
+Subproject commit 8fd47bb2508a861a79f9927771547abf02958ac6
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
index 09218271a..e83835f77 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/managers/StateUpdater.java
@@ -211,10 +211,11 @@ public class StateUpdater extends PlayerEventListenerHelper {
             state = new State(getNewPosition(item.percentWatched));
         }
 
-        boolean nearEnd = Math.abs(mController.getLengthMs() - mController.getPositionMs()) < 10_000;
-
-        if (state != null && !nearEnd) {
-            mController.setPositionMs(state.positionMs);
+        if (state != null) {
+            boolean isVideoEnded = Math.abs(mController.getLengthMs() - state.positionMs) < 1_000;
+            if (!isVideoEnded) {
+                mController.setPositionMs(state.positionMs);
+            }
         }
 
         mController.setPlay(mIsPlaying);
diff --git a/smartyoutubetv2/build.gradle b/smartyoutubetv2/build.gradle
index 73672655e..081c80470 100644
--- a/smartyoutubetv2/build.gradle
+++ b/smartyoutubetv2/build.gradle
@@ -46,8 +46,8 @@ android {
         applicationId "com.liskovsoft.smarttubetv"
         minSdkVersion project.properties.minSdkVersion
         targetSdkVersion project.properties.targetSdkVersion
-        versionCode 65
-        versionName "4.5"
+        versionCode 71
+        versionName "4.51"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L"
 
diff --git a/smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java b/smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java
index 4e108c80a..e6c514b92 100644
--- a/smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java
+++ b/smartyoutubetv2/src/main/java/com/liskovsoft/smartyoutubetv2/tv/ui/playback/PlaybackFragment.java
@@ -70,10 +70,10 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
     private SubtitleManager mSubtitleManager;
     private DebugInfoManager mDebugInfoManager;
     private UriBackgroundManager mBackgroundManager;
-    private final boolean mEnableAnimation = true;
     private RowsSupportFragment mRowsSupportFragment;
-    private boolean mBlockEngine;
-    private boolean mEnablePIP;
+    private final boolean mIsAnimationEnabled = true;
+    private boolean mIsEngineBlocked;
+    private boolean mIsPIPEnabled;
     private ExoPlayerInitializer mPlayerInitializer;
 
     @Override
@@ -236,7 +236,7 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
         mPlayerGlue.setHost(new VideoSupportFragmentGlueHost(this));
         mPlayerGlue.setSeekEnabled(true);
         mPlayerGlue.setControlsOverlayAutoHideEnabled(false); // don't show controls on some player events like play/pause/end
-        hideControlsOverlay(mEnableAnimation); // hide controls upon fragment creation
+        hideControlsOverlay(mIsAnimationEnabled); // hide controls upon fragment creation
 
         mSubtitleManager = new SubtitleManager(getActivity(), R.id.leanback_subtitles);
 
@@ -472,22 +472,22 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
 
     @Override
     public void blockEngine(boolean block) {
-        mBlockEngine = block;
+        mIsEngineBlocked = block;
     }
 
     @Override
     public boolean isEngineBlocked() {
-        return mBlockEngine;
+        return mIsEngineBlocked;
     }
 
     @Override
     public void enablePIP(boolean enable) {
-        mEnablePIP = enable;
+        mIsPIPEnabled = enable;
     }
 
     @Override
     public boolean isPIPEnabled() {
-        return mEnablePIP;
+        return mIsPIPEnabled;
     }
 
     @Override
@@ -577,9 +577,9 @@ public class PlaybackFragment extends VideoSupportFragment implements PlaybackVi
     @Override
     public void showControls(boolean show) {
         if (show) {
-            showControlsOverlay(mEnableAnimation);
+            showControlsOverlay(mIsAnimationEnabled);
         } else {
-            hideControlsOverlay(mEnableAnimation);
+            hideControlsOverlay(mIsAnimationEnabled);
         }
     }