Fix up factory