conditional logic to accomodate f18 and f19 package conventions