block bugs fix