Organization as Author - comma trick doesn't work here!

I’m having the common problem citing an organization as an author in Endnote…I’ve tried the comma at the end trick but it doesn’t seem to work when the organization has commas in their name. For example, the organization is:

Australian Infant, Child, Adolescent and Family Mental Health Association.

However, if I put a comma on the end, it comes out in my reference list as:

Australian Infant, C., Adolescent and Family Mental Health Association,. (2004).

Obviously this is not what I need. Can anyone in this wide world help me??

There are some suggestions for this issue on this thread:

I don’t know if someone has come up with another idea in the meantime.

Excellent. Double commas! Who would have thought. We wouldn’t want Endnote to make it easy for us would we…