Trying to fix issue with buffering.