Fix bug where two records are needed