For ENG-6244, apparently it was still necessary to keep the buffer not null