#39 fixed start and end time swapped bug