Line Buffer Fix