Fixed blocking issues