Review needed to resolve bundling issue.