Fix license selection hack so it works when a license version is specifically and correctly requested