Fixed auto-instantiate issue with namespacing