better handing of license exp dates