Fixes task deadlock (???)