Issue #182 - Check to far in past and future