fixed null for dates