More aggressive byte shift correction