Multisite Domain name Mapping and image paths

Hi all.

Just come across an issue which I’m not sure is by design or a problem with our setup of WPMS.

We have a WPMS install setup with a open ‘root site’ on DOMAIN-1.COM and a couple of (folder based) subsites each with their own address using the Domain Name Mapping plugin, eg. DOMAIN-SUBSITE-2.COM.

Everything is working as excepted except when I’ve checked the source of images in posts/pages I noticed that they where still under the root sites domain.

In other words the image path was https://DOMAIN-1.COM/subsitefolder/wp-content/uploads/sites/etc…/image.jpg.

What I would expected would be https://DOMAIN-SUBSITE-2.COM/wp-content/uploads/sites/etc…/image.jpg.

Am I right in my assumption and there is an issue or is this by design?

Thanks in advance.