re #919 - Properly sanitize the date