[FIX] Atomize argument of maps and arrays