try to fix deadlocks (#23)