Fix duration issue