Really fixes #141, with Python 2.5 compatibility.