[Fixed] record keepers (again)

Change-Id: Ib7836cf65d70bb2fc63ac4114cc42994eea37c7d