Fix Buffering Issue