Fix EndDate Bug