Fix unexpected clearing of Invocation