Fixed BaseFactory