Fix for date field