Extend the fix already created for PR 16858 so that it works with x86 PE targets...