Fix of carrier code to handle more frequencies.