Merge pull request #208 from jcmurray/master

Fix logic around invocation by HCE