fixed End Date issue