Bugfix for date fields