Fix no-block-selected bug