better accounting for Date field