Add little work around that will always avoid deadlock.