Add work around for X-Tag issue related to relatedTarget
Merge pull request #269 from arv/fake-related-target

Add work around for X-Tag issue related to relatedTarget