Fix behavior on buffers with no identifiers