Getting deadlock errors in logs

This should address it