Fixed issue on clIdlGen with specific SERVICE CLIENT ID