Fix #19, get back 2.065 compatibility.