fix bugs merge ianic