Fix erratic block highlighting