Browsing: fix Buffering