FIX: Fix for py3k