fix blocking issue