1 files changed, 5 insertions, 3 deletions
diff --git a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
index d0ae71e4d4..8042e1b264 100644
--- a/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
+++ b/client/src/main/java/com/vaadin/client/widget/escalator/ScrollbarBundle.java
@@ -587,10 +587,12 @@ public abstract class ScrollbarBundle implements DeferredWorker {
      * @return the new scroll position in pixels
      */
     public final double getScrollPos() {
-        assert internalGetScrollPos() == toInt32(
-                scrollPos) : "calculated scroll position (" + scrollPos
+        int internalScrollPos = internalGetScrollPos();
+        assert Math.abs(internalScrollPos
+                - toInt32(scrollPos)) <= 1 : "calculated scroll position ("
+                        + scrollPos
                         + ") did not match the DOM element scroll position ("
-                        + internalGetScrollPos() + ")";
+                        + internalScrollPos + ")";
         return scrollPos;
     }