Fixing tools with any help see BT#6904