Added temporary solution to solve the end date issue