Fix logic around invocation by HCE