Solution & Product Enumeration fixed