FIX of unity factory