FIX: do not ignore date field