Identifier Manager fix