No more blocking threads after applying both fixes

No more blocking threads after applying both fixes