Added 2.6 compatibility.