fix for clean 2.x install, part 2