Same as previous commit but for this tool.