Fixed for empty entries.