Fix #1837 "Versioned resources have expiration date in the past"