Fix ip2c for new format