Duration bug fix