Added more conditions to skip using col_buffer when not needed