Removed unnecessary storage of invocation checker and added improved invocation check