Fixed Factory class.