Fix itext refactor