Should fix the buffering