Feature/fix ipt