10 OCT Fix Bug on update end time