Fixes forge construction weirdness.
Merge pull request #9567 from Rivet-the-Zombie/forge-fix

Fixes forge construction weirdness.