Fix unbundling of product