Buffer New Record
Bug fix
Removed getRecord dependency