Fix Factory
Fix factory