Fix the instantiation problem with auto-instantiation via metada.xml