Attachment selector wiki macro cannot be used multiple times on the same page with displayImage=true

This is about this macro http://extensions.xwiki.org/xwiki/bin/view/Extension/Attachment+Selector+Macro .
When used twice on the same page with displayImage=true, second time it will not display the image properly, because the link to the image is wrongly generated (it has a "||" at the end).