fixed issues with identities and endpoints beeing saved on stack \?!