Fix all invocation