Fi x block_highlight_finished not emitted