Bugfix: use the new API for instances.