FIX: Fix for Python 2.6