fixed cleanup-buffer again