Corrected or logic to make use of max_buffer_size if it is setted