Fix regexp to preserve org buffers