Feature/fix itree