Stop deadlock

Fixes #101