[FIX] avoid dict stuff