US538 - Fix wrapper not being expanded