Fix wrapping not decorated collection