Fix records
Merge pull request #35 from JasonGYoung/FixRecordsPart2

Fix records part 2