Fix toggle mark behavior