fixed some blocking issues