Added support for an 'old' buffer file