Should have fixed highlighting completely, another attempt at stall fixes