fix change for TimeExpression