bugfix: use instance name instead of class name