Does https://github.com/OpenRA/OpenRA/pull/4148/files#diff-d900a31aec12ab9442447844e5fce114R79 help?