Fix GEN-BUFFERS