diff --git a/TIUIElements/Sources/Helpers/HeaderTransitionDelegate.swift b/TIUIElements/Sources/Helpers/HeaderTransitionDelegate.swift
index 48c48fe7..1beb4084 100644
--- a/TIUIElements/Sources/Helpers/HeaderTransitionDelegate.swift
+++ b/TIUIElements/Sources/Helpers/HeaderTransitionDelegate.swift
@@ -54,7 +54,9 @@ open class HeaderTransitionDelegate: NSObject, UIScrollViewDelegate {
         }
         
         if isFirstScroll {
-            startOffset = headerViewHandler?.startOffset ?? 0
+            
+           
+            startOffset = max(-(headerViewHandler?.startOffset.y ?? 0), 0)
             navigationBarOffset = headerViewHandler?.navigationBarOffset ?? 0
             isFirstScroll = false
         }
diff --git a/TIUIElements/Sources/Helpers/Protocols/TableViewHandler.swift b/TIUIElements/Sources/Helpers/Protocols/TableViewHandler.swift
index a094d185..23bf9618 100644
--- a/TIUIElements/Sources/Helpers/Protocols/TableViewHandler.swift
+++ b/TIUIElements/Sources/Helpers/Protocols/TableViewHandler.swift
@@ -5,7 +5,7 @@ public protocol TableViewHandler {
 }
 
 extension TableViewHandler {
-    var startOffset: CGFloat {
-        max(-(tableView.contentOffset.y), 0)
+    var startOffset: CGPoint {
+        tableView.contentOffset
     }
 }