Fix #87.  Convert to multipart on Multi* layers