fix enable/disable of fields and buffer handling