Empty records fix