Fixed #30 - FactoryDiscovery Bug