Need to fix idt handler