bugfix: deadlock