MinorFix

1) without 'stable' in the unique function, it changed the order of the
class vector
2) returning classes