Fix bug on changing from set to list