Fixing deadlock
Task completion source