Revert "Revert "Fix undefined wealth""

This reverts commit aa20c0255918fa899b33463e35f55452020423df.