extra/idnkit fix