bugfix: hopefully no lock-ups any more