diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc b/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc
index 8e75527949..af594580d0 100644
--- a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc
+++ b/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc
@@ -407,7 +407,7 @@ uint32 CodedInputStream::ReadTagFallback() {
 
 // Osmand change ::
 int CodedInputStream::getTotalBytesRead() {
-    return total_bytes_read_ - (buffer_end_ - buffer_);
+    return total_bytes_read_ - (BufferSize() + buffer_size_after_limit_);
 }
 
 bool CodedInputStream::ReadVarint64Slow(uint64* value) {
diff --git a/OsmAnd/libs/armeabi/libosmand.so b/OsmAnd/libs/armeabi/libosmand.so
index e41d72620e..f05b199dbf 100755
Binary files a/OsmAnd/libs/armeabi/libosmand.so and b/OsmAnd/libs/armeabi/libosmand.so differ