For IDI 1.6.5