Fix factory case