Fixed handling empty record values