Bugfix: instantiation