Improve fix for wrong tfc. Fixes #4082

Don`t merge it yet, first we need that fix to WMCore would be approved