Validation fix for strict datechecks