FIX: Python 2.6 compatibility