Fixed error where products with one sub product was breaking the
enumeration because of an unexpected return type