Corrected issues with subfunds.