Fixing deadlocks introduced with recent patch