Bug on ID2 fixed