Fixing invocation issues