fixed duration issue / bug