ExpectedDuration bug fix