fix RMF with buffers