Fix issue #1689

Fixes two deadlocks in bind backend