Fixed invocation bug