fixed org factory