diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index cd8bdd38d5..847128c8a6 100644
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -80,7 +80,10 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
         
         return ff_interleaved_ue_golomb_vlc_code[buf];
     }else{
-        buf|=1;
+        LAST_SKIP_BITS(re, gb, 8);
+        UPDATE_CACHE(re, gb);
+        buf |= 1 | (GET_CACHE(re, gb) >> 8);
+
         if((buf & 0xAAAAAAAA) == 0)
             return INVALID_VLC;
 
@@ -88,7 +91,7 @@ static inline int svq3_get_ue_golomb(GetBitContext *gb){
             buf = (buf << 2) - ((buf << log) >> (log - 1)) + (buf >> 30);
         }
 
-        LAST_SKIP_BITS(re, gb, 63 - 2*log);
+        LAST_SKIP_BITS(re, gb, 63 - 2*log - 8);
         CLOSE_READER(re, gb);
 
         return ((buf << log) >> log) - 1;