Minor update for 3.1.X compatibility.