without rewriting, see if this will fix the 301 test failures....