Fixed date handling in escape module