Pushing the fix out to more files.
Test for 3417012