Fixing lead matching