apply the fix closer to the source of the issue