Issue 1859: Check presense of dates, then manipulate