Fix to prevent downcasing of dates