Fix bug when creating ITM V2.0