Text Buffer Fix