#2061 avoid duplicate tooling entries