Modify in update (avoid null for TimeInterval)