Fix for DomainSpecific when there is more than one DomainSpecific item

Change-Id: If79660aceb009a1828a7aed387fa2225bcd6a26c