Are we sure that this will work on Python 2.5 too? (introduced by #71)