fixes maked in ID&T