Fix CCE as param values are sent as Strings