[Fixed?] record keepers

Change-Id: I91119163cc87cd6dc8bdd8e84774f73c2d3a2991