Fixed for py32, py33 (added to tox)