Slightly improved blocking condition stuff