Fix to take into account List / Set