Really fixed bad highlight