Handle [1..*] properly (somehow got lost in the refactor  :-( )