Fix watch and election