Expected duration bug fix