Fix wrapping of single models