Fixed blocking bug