[FIX] Fix set + list not supported