Fix issue on Blocked threads