Fix records

This is a bit of a kludge.  A more permanent fix should come later.