fix address and ICP logic