Should now work with pythyon 2.6