FIX: Fix for Py26