Removed some blocking checks