Fix for Python 3 (maps no longer return lists)