Updated version for instantiation fix