Improve fix for wrong tfc. Fixes #4082