fixed endtime
Fixed time issues