Deal with blocks correctly