Narrow the scope of the fix a bit more