Another attempt at licensing fix